scrollbar: Make final

diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 64d81769cf1ca9b80e6d016ac330451ccfaf2055..82b3d7959e0be4e28f0b1f7d503b41b28cdd8bc6 100644 (file)
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -81,6 +81,18 @@
  * classes related to overlay scrolling (.overlay-indicator, .dragging, .hovering).
  */
 
+typedef struct _GtkScrollbarClass   GtkScrollbarClass;
+
+struct _GtkScrollbar
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkScrollbarClass
+{
+  GtkWidgetClass parent_class;
+};
+
 typedef struct {
   GtkOrientation orientation;
   GtkWidget *box;

diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 1926e8f35551285d76d5cdc7fc015d8137ca1328..886cc85fe355c73a69347a330a01c24793691186 100644 (file)
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -37,30 +37,10 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_SCROLLBAR            (gtk_scrollbar_get_type ())
 #define GTK_SCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbar))
-#define GTK_SCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR, GtkScrollbarClass))
 #define GTK_IS_SCROLLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR))
-#define GTK_IS_SCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLBAR))
-#define GTK_SCROLLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbarClass))
 
 
 typedef struct _GtkScrollbar        GtkScrollbar;
-typedef struct _GtkScrollbarClass   GtkScrollbarClass;
-
-struct _GtkScrollbar
-{
-  GtkWidget parent_instance;
-};
-
-struct _GtkScrollbarClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
 
 GDK_AVAILABLE_IN_ALL